Autogenerated HTML docs for v1.8.3.2-701-g8c4e4ec
diff --git a/git-config.html b/git-config.html index 8db1bbe..513464e 100644 --- a/git-config.html +++ b/git-config.html
@@ -2703,6 +2703,8 @@ This variable consists of a list of tokens separated by spaces or commas: </p> +<div class="paragraph"><p>These options control when the feature should be enabled +(defaults to <em>never</em>):</p></div> <div class="openblock"> <div class="content"> <div class="dlist"><dl> @@ -2730,12 +2732,20 @@ show in columns if the output is to the terminal </p> </dd> +</dl></div> +</div></div> +<div class="paragraph"><p>These options control layout (defaults to <em>column</em>). Setting any +of these implies <em>always</em> if none of <em>always</em>, <em>never</em>, or <em>auto</em> are +specified.</p></div> +<div class="openblock"> +<div class="content"> +<div class="dlist"><dl> <dt class="hdlist1"> <code>column</code> </dt> <dd> <p> - fill columns before rows (default) + fill columns before rows </p> </dd> <dt class="hdlist1"> @@ -2754,6 +2764,13 @@ show in one column </p> </dd> +</dl></div> +</div></div> +<div class="paragraph"><p>Finally, these options can be combined with a layout option (defaults +to <em>nodense</em>):</p></div> +<div class="openblock"> +<div class="content"> +<div class="dlist"><dl> <dt class="hdlist1"> <code>dense</code> </dt> @@ -2772,7 +2789,6 @@ </dd> </dl></div> </div></div> -<div class="paragraph"><p>This option defaults to <em>never</em>.</p></div> </dd> <dt class="hdlist1"> column.branch
